Merged lps 48330 lps 48480 lps 48983

Hey,

This is a simple merged branch.

Thanks,
 Zsaga