Merge "Moving code to previous behavior"