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