* commit '6dd38cc5343106251c8d66ab11bb93550082e594': Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
* commit '6dd38cc5343106251c8d66ab11bb93550082e594': Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."