$_old now protected
Merge remote-tracking branch 'origin/master'
Photo user_id selection fixed