Another attempt to fix image popping.
Merge branch 'release/3.1.4'