Take ActionName attributes into account in ExpressionReader
Formatting
merged buildpackage script