Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master"