Merge branch 'bug_607_parental_control_fix' into experimental