Plane: fixed APM1-1280 build
Merge remote-tracking branch 'upstream/master'