Merge "(Fork) MR1 Fix for crash in <select> drop down" into klp-dev