Merge remote-tracking branch 'andromadus/andromadus_4.4' into HEAD

Change-Id: If13b5af97776ee7c8c772b150cea277d2a1b4a24