Bug 902834 - Implement hack and merge australis branch with master

(cherry picked from commit 81520cf6f0d650be6279ede789b302e537bc3d56)