fucklrxagain
to merge 1132
Merged
Final version. Reviewed by szl