Merge "Fix for pike nova placement interface pick." into release/2019.2.0