Core change (41/42)

Core change