Storing patch for alpha->dev version

Fix for AETVRD-610/AETVRD-677/AETVRD-601