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