Merge "Previous model height return problem fixed" into devel/master