#414 #415
Merge branch 'master' into remdex_dev
Changes for #404