[sr-dev] git:lazedo/4.2.1: Merge branch '4.2' into lazedo/4.2.1